report fixes from 2.4