Revert "Revert "Fixed minimap issues""

This reverts commit b6c383db7d6c9f455eef07cad94edeaffbeb4a5c.