Minor translation improvements