Tweaks from testing