Some extra work on issues translation