make sure we handle CounterColumnType and small spacing fixes