0: MPNS and generic connect fixes