few fixes.