Small improvements to the feature parser for compatibility with 2.0