endpoint_type and https fixes