fix up for mac compatibility after refactor for serialization code