Merge "Fix printf warnings"