client find-bugs resolved