schema changes to resolve cuttlefish warnings.