More Shop Robbery fixes