Fixing Clients Environment