Some quick-fixes to get to a demo point, after the loss of some files when GCE VM and disk were erased