More fixes to accomodate S.B.'s data.