Fix deprecated config elements