Allow map normalization, various other small fixes