Fixed a few regressions with new refactoring