Authorization tweaks