TSP-4468 small bug fixes