Fixes for master locale