Fixed some client sync issues