Some force cashout related fixes