Fixed bugs with refactorings.