Final bank fixes

A lot more needed changing due to bank tabs than I originally thought