Minor fixes after TTT #3