Fix the build

Fixed a few errors in the build etc. I need to do a better job of review. :)