Fixing small problems with schema changes