Settings divided: local & develop
Fixup settings