Fix some semantics