Various improvements to plan settings