Adding minor improvements