Fix multiple issues for oauth auth component