Improve bootstrap support for Ubuntu.