More https-compatible changes