fixed a few things to match what cern/eth does