Individual CRUD fixes + family fixes after schema change