Fix up one issue, mark another to be fixed.