Fixes for Pangolin changes.