Move locale flags to better location