Tweaks for Helpers