FIx C99 compliance

FIx C99 compliance