local: Review fixes.