more schema tweaks