Fixed some serialization issues that would causea crash upon loading.