Missed a couple enumeration swaps

Missed a couple enumeration swaps