Added client fixes