Upgrade to new build system
Fix