Fixed https/http issues