Joshua Phillips Fixes for C tool.