fixed few inconsistencies after internal review

1 job from 3.3.1-dev-final-draft in 0 seconds
Status Job ID Name Coverage
  External
passed jenkins

00:03:07