Immature balance fixes