Upstream snapshots and a few mods