Some setup production fixes
Merge pull request #1 from taigaio/jespino-review

Some setup production fixes