Some more problems and refactorings