Fix feature gen