fix some faults