Fix https and minor adjustments