Fix requests issues