Fixing schema issues