various fixes for different packages in Debian vs Archlinux