[FIX] Some maps fixing