Two item fixes.