Fix connect and disconnect messages