Trying to fix migrations
Fixed some issues