Fixed connection problems