Various motion hotfixes