Fixing some semantics.