Fixing stuff related to the options columns change.