A small number of fixes.