More account balance fixes