Fix haste caps

Before these were mostly guess work, now based on what clients report
since they do their own calculations so are most likely correct.