Address the comments from Alexey and Pete.