Schema-ish tweaks