Changes for Manjaro v18.0