Corrections from refactoring