Fixed Migration Issues