Fix Authorization Issues