Bit more serialization work + fix NetBeans refactor mangling