Fixed a Few Connection Bugs