BP 2.1+ compat and lang file update