core dump fixes