A few small changes regarding debugging

Debugging signature matching is made easier.