Some fixes for recent Ubuntu installs