Tweaks from tom