Hacked non-cmake build
Fixed a couple warnings