Fixed C-wrapper errors