Fix minor issues with immortal/Immortal and a bug in the max of two
costmaps