Add some more limits to tracing