Final balance fixes