Fixes for CDH pesudo distro