More ecl catkin bugfixes for dry stacks...ugh