Fixes to experimental sjt-xft branch committed