Avoid deprecation notices