Semantics tweaks