Fixed keystore location inconsistency