Corrected some issues regarding saving and locales