Some authorisation fixes