Misc semantic tweaks