Fixes to Helpers