Fix merge issues with the win32 library patch