Fix keystore overriding