Fixing stuff we broke with the refactoring.