Fix compilation for CDT 8.2