Some changes to make the plugins debuggin a little easier.