Merge "Fix format strings mismatching the parameters passed to them"