Temporary movement fixes.