Went through all Deserialize calls, making sure things look OK for Load. Also a few warnings cleared.