Bug fixes.
Initial revision.