Bunch of minor changes

Just some small corrections I stumbled upon.