Make the options for the general and profiles more consistent