Final Authorization Tweaks