Small changes to deal with Backend class changes.