Make several small semantic changes