fixing build issue and issue with connection timeout