add fallbacks for locales with different name in gaia + fix warnings