Fix -Conf for both and terror for 1.2.0