Fix some issues with using connect from many places