N2 c connections

Some fixes for certain crashes found by ritesh