Fixes for refactoring