Autolocale improvement