Fix Map.norm

This fixes a couple of incomplete things introduced with: #596

@wafels This relates to #654