Some Tank Fixes