* Minor bug fixes.
