Fixed compile errors due to earlier refactoring