Fix taking effect of some option changes