Authbind and keystore idempotence fix