experimental automatic conversion of connects, bug fixes