Address Paul's review comments