Fix movement bugs