Fix computation expressions