Fix register layout with new column sizes