Migration fixes from older releases