Update to build against CDH4