Fix 'connect' warnings

Requires rebase after #585 merge. It's trivial so feel free to take it.