Fixing bugs and traces.