Agent changes for L2 only VM mode