fix deprecations and creation