More fixes for compatibility with Arch Linux.