Cleanups
Locking on update_bundle and verifying manifest versions