local: Review fixes