Don't forget the hoses that go into the top or the vent line.
Gorilla extreme duct tape worked pretty well for me as a replacement for the foam over the straps of the tank support.
What's the Best Tape? Abusive Lab Test - Popular Mechanics
Don't force anything, especially as you tighten the bolts on the support straps.