Refactoring, 1.5.2 fixes