Minor bug fixes to the cgsi_convert plugin.