fixes to some paths which got broken when we moved into an engine