Fixes for Ubuntu guests

These patches fix some issues for Ubuntu guests.