4.0: Fix individual languages