Add some more C wrappers; patch from Krister Walfridsson