Fixes for Cash Accounts