Fixed some Client Server talk