Adding minor fixes from class