3: HTTPS fixes continued