Update changes as recommended by authors