Fixing up semantics