Upgrade some blobs to mako ones