Model: more bugfixes after converting fields to objects