Two bug fixes.