Fixing more helpers rubbish