VM listing issues/bugs fixes.