Minor tweaks noticed by Jon Busby.