Merge "Use correct types for thresholds"