Fixes to Columns behaviour