More fixes for moved thresholding.