more C API warning cleanups