Java creds review fixes