More cscope fixes