Bug fixes.
Code cleanup.