some deprecation warnings fixed