Minor updates.
Some minor fixes.