Fixes build issues on tcr-checkcert branch.