- Fixed lingering usage problems with client