Tweaks from Pete