Several improvements from TTT