locale fixes, including fix #962