Fixed some movement bugs