Fixes on optional exercises.