Fixes to the engine division