More connect changes