Fix a couple of bugs in features.py