Fix moch peer/connection mix up