add some support for nightly devtools changes