wrapping up loose ends from the harried update to work with manifest v2