biklas7 fix null safety migration issues