Adjust key-store handling to work like other version