fixed some leftovers from major XML serialization

Some changes slipped before I submitted the major group of changes.
Updated files to compile correctly