* Minor fixes to support C files.