CLIENT codestyle fixes