Fix redirect problems
Get rid of https wrapper