Fixes lockup on SMP boxes, and fixes buggy map scanning code.
Attach a file by drag & drop or click to upload
