"Fixed" deprecation warnings