Fixing issues with TSL and TSL Manager