creator fixes