Patches for Unix plugin