Update to new build system
Update to latest build tools
Fix up some minor issues