Japan and small tweaks