fixes on core migration