Small changes in ConnectionHandlerImpl yet again