Fix-ups to column generation

Change-Id: Ibdd1b8c5447bf26340fda12e50b8a58ec468cce7