More tweaks to the engine body core.