Fixes to make the Tank a little more generic.