Fix more HTTPS issues

Remove HTTPS issues