Small changes to work with current rust HEAD