fixes migration concerns

T695
T697
T691