More code fixes.