Tweak prediction, fix move without ts.target