Minor fixes, from @cmacrae.