fix some multiarch stuff