Revive Fixes

Looks like its working fine now.