Fix bugs in saving tank objects