Fixes #1713. Made global helper classes use important so they don't get overriden