Fix refactorings. Project builds and runs.