ticket fixes