Fixes in semantics