Fixes for initial locale