Fix nestest bugs. Reset is blowing up on CCL, investigate later.