Some misc fixes. dont remove translated fields