Some fixes to automated ctags