Fixes to motion constants and basic key suppression