Movement bugfixes