Tweaks for roger