Cleaned up our project so it runs happily on Windows