Patching library to get more features actually working in C rather than C++.