Fixes for circular dependency issue