Minor fix plus config transforms.