Fixes for the feature