Linux fixes

This gets the linux build compiling to 100% for me on Ubuntu