Minor schema tweaks