Fixup and cleanup on builtin auto generated dynamics