Few minor fixes.