Fixed minor authorization issues