More configuration fiddling