Fix non-compund types in cs_project