More fixes to frequency