minor schema fixes
Merge branch 'develop'

* develop:
  minor schema fixes
schema author fix
Merge branch 'develop'

* develop:
  schema author fix