Danone has said that Japan remains a "complex" market for its waters division and one that still needs to be "fixed".