Fixed tank bugs