Fixes to make it compile (also removed motion manager as it's structure will be chaining)