Fixed client bugs :)