Copy some fixes from tntrun