Serialization fixes, fix busted