Modified cmake files, and includes to correctly turn on serialization for newer systems.