various cdh4 configuration fixes and updates