Fix conditional values in some more places