Fix issue; Fix HTTPS issue