Client and other client bug fixed