Fix issues with p.a.debugtoolbar