Updates for auto init/deinit review comments