A few bug fixes.

12 files changed