Fix/misc

misc stuff, fixes MS Windows build with OpenMP (hopefully)