Fix movement stuff