Trad FR, small bug fixes