Another bug fixes.