Some SWGMap fixes