Updates for working with the new Ubuntu.