fix test build
Merge branch 'ebfe-fix-build-master'

Small changes for latest rust nightly