some fixes for minimap, samerCommit incoming