Client changes/fixes