Tweaks
More usage of ActivateGuard