Setupvm fixes