Virtfs and assorted cleanups etc etc