Fix some movement bugs