Tweaks to get things compiling on linux
Tweaks to get things compiling on windows