Updated with fixes for TCC on Win32