Fixes for updated debug toolbar