More high-/low-level C API adjustments