Minor QA fixes