more fixes to make monte/tth work