International fixes