a few fixes.