More fixes to the tickets