Fixing Helper Issues