Fixed bugs from refactoring