Some semantics fixes.