fixes for old gcc versions (4.4)

it was having trouble with brace initialied maps of sets