More trial fixes