Fixes for locale and plugin support