Issues Conversion bug fixes