Adding minor fixes