More fixes for archlinux