Fix lazy connections