move connection fixup back into renderDraw methods