Fixing some conditional statements in dirac and spar