RC calibration: Cover a number of additional corner cases