I will look into making these two config options.