Fix problem caused by void ptr and clean up code paths