More compile fixes.
Compiles and links.
Fix merge conflicts (hopefully)