Fixed most authorization