Changes to make engine inclusion work