Fixed some types and did more migrations