fix va_start warnings
Merge