Fixes to the feature