Fixed some connection issuse