Add patches to fix the rest of the warnings