made some fixes against kick messages