Corrected some small mistakes
Merge branch 'master' into correctionsPlanOA