Fixing some of things I just broke, so serialization works again