Fix breaks due to refactor