devtools, more fixes for housekeeping