Vivo: Add-in patches those are needed for proper build