Fix 2 bugs in FeatureContext