some fixes and more deprecations