Move interrupt call to StreamThread.watch, fix pathfinding bug