Fixed warped doUntil
Fixed unwarped procedures