Few fixes for C flag passing