Fixed some deprecation warnings and other issues