Small code fixes.