Minor migrations adjustments