Fixes to refactor