mom-85 Fix unassociated pointers