Fixes to work with Eve 0.18