local: Review comment fixes