Fix: Minimap refactoring