On the Sharh al-wiqaya there is Ibn Kamal Basha's al-Idah fi sharh al-Islah, printed by DKI. Although in his introduction he says that he has altered the text, for the purposes of correction and clarification, and so how much of the original matn of sharh al-wiqaya is preserved in his work I'm not sure. As he says: وسميت المتن بالإصلاح ، [لتضمنه إصلاح ما في الوقاية من الزلل] والشرح بالإيضاح ،[لاشتماله على إيضاح ما في الشرح المذكور من الخلل]