enhancer bug fixes, imports don't work correctely for inherited entities