Fixes for Ubuntu guests

The following fixes some qemu-tests for Ubuntu guests.