Updating schema, other minor fixes