Credit Andrew fixes for mostly Arch build