fixes from TCH remarks FMS-25