Fix boring stuff in 6model/serialization.c