Fixed minor quibbles from @vasi