More fixes and also generation frequency configs