A few bug fixes.
A few fixes.