Permissions fix and config changes.
Merge origin/master