Tweaks noted by landry@