Fixed two Generator bugs