Review comment fixes, will be squashed