Creator fixes