Fixes.
Connecting with clause fix (do not try to find connection automatically).