Improve building on non-amd64 platforms