Pump: fix errors on BTreeMap import