Frantext-specific fixes