Some adjustments to com_out and onc specific work