Authorization Fixes