Map<> support: bugfixes and testcases