Cleanup and serialization issues, cont'd
persistent generated change to odd