Minor changes needed for fringe cases.