Avoid deprecation warning in standalone Client