exclusive locks on un/packing and stopwatch message fix