Fixes to get motion to compile