Some import fixes, some static lib and win32 enhancements.