Fix a number of HotNumber issues.