Fixed connect issues

Previous commit didn't go through..