Revive fixes

Ups