Replace two more flag arguments