move got fixes (: