few fixes in map initialization