Some changes for google_devtools