Last few fixes.