Address review comments. #612