Fixes for feature project