changes to support a few vApp specific needs