Minor fixes in comment and mapper