continue improving support for non-pane vm's