Tweaks to reflect comments from thockin