little semantics fixes