Fixes for Windows plugins