Fixed up some things in client