Changed some client attributes to fix merge.