Cscope fixes