Fix cell lifecycle stuff on add/edit VC