CDH5 configuration optimizations and tweaks