The connection issues were addressed in a different changeset (changeset/164031413), but I appreciate you pointing this out. I will try to complete all the needed modifications in one changeset.