Connection ip issues

Attempting to resolve #336 and #333