A few small serialization related fixes.

With these, serialization of CORE.setting works out.