Address review comments. #557