Minor fixes on config options