Address review comments from @iansf