Minor updates to work with the latest devtools alpha