Still no China deal in sight but US president eases tensions with France and Japan.