fixes for localized environment