Fixed connect issues

Previous commit didn't go through..
Merge branch 'master' into xtremeMakeover