Further changes for combined corr, bilin and stout