client bug fixes