Fixes for multimap