Just some code fixes.