Add a call to CDataStore::Finalize right before we send a packet (and some minor codestyle clean-up)