goodie_helpers: Fixes from @moollaza