Adding minor fixes.