Fix movement inconsistencies