Authorisation around suspension, and misc changes