Patches for MinimalXds plugin