Tweaks from another test