Schema element tweaks