Address issues found in Horia's review.