More Windows build fixes... doesn't look out of the woods yet
Fixing Windows Library loading