More C Binding fixes.