Fix *-cell fns