Credit adjustments & client wave counter fix