More workarounds for numerical stability issues