Issue conversion changes