Various C changes