Tweaks from @johnchaffee