Adjust for upstream cert store changes, improve cert handling significantly