Some fixes and tweaks to build. We should be good to go now. I'm going to notify the list then merge into the head.