Minor changes
More minor changs