fixes in xtalk