Migration fixes