T20: Small changes