Fixing clients bugs