Fix a few more things after refactoring