A couple of translation related fixes