more amd64 fixes