ForExpressionExercise fixes