More C API changes :|