Do the changes as suggested in Coredump review.