References fix, locales reworked