more movement/ospec fixes