Fixes to interleaved/column view