Fix some issues with va_list's being passed around incorrectly