Fix various failing model specs