Update to deal with template calltips