Debugbar fixes