Minor fixes for Arch