More fixes with simple keystore