iwc client fixes