Fixed some issues on the clients section