Fixes regressions after file reorganization