migrate fixes