Updates to fix client bugs