Minor adjustments for better debugging and tracking clients