Fix up models; implement part of migration up