Minor adjustments for C