updates to make arch build work again