Creator fixes
Merge pull request #179 from dlu-gs/hotfix/creator

Creator fixes