fixed a few places from cdh4 to cdh5