A couple of schema/designer tweaks to get some other tests to validate