Connection bugs fixed