more fixes for CDH4