Minor changes for better tracing