Fix compilation errors for cdh3 / 0.20