Few fixes and handle DetectRedirect errors