Misc corrections after doing it on a second machine.