Nullable support and serialization fixes