Tweaks from Scott