More fixes for wrong format arg/value pairs.