Add some traces to allow debugging