Misc fixes of java keystore location