xscope fixes

Merged Alan Coopersmith requested to merge alanc/xscope:tk-fixes into master

Merge request reports