Latest threshold fixes.