First post-refactoring run bug fixes