resolve some deprecation