Fixed: deprecation warnings