Update upstream code
Silence warnings