Additional Fixes for Ubuntu Guests