Some fixes in Bank module