Some issues on connection fixed