Minor connection fixes