Both changes have been applied as suggested.