Merge "Fix printf formatting"