Minor semantic changes