More https-related changes from gxp