Add minimap back
Fix references to upstream