more tweaks to get cdh5 working