Minor Electric Pump container fix, cleanup