clean up some warnings/deprecations