Fixed some auth failures form some cases.