OVS review

This pull request is to collect review comments.