Small fixes
Merge pull request #23 from blackbirddev/setup-post-configurator

Small fixes