Fixed what the schema update refactoring broke