Fix translation issues