Some minor changs