Some fixes for Japan profile.