Tweaks from dave.