- Use varargs for addRaw args
- Fix a warning