Rebuild patches, fix yomama