Improved built-in build but still not fully operational on Ubuntu