mainly locale fixes