Fixed a few issues that were causing compilation problems under windows.