clientHandler fixes