Some minor changes (typo, map lookup, ...)