Fix https issues