Authorization fixes