Cleanup and fix manifest for virtual/udev