fixing schema issues
SCHEMA CHANGES