Patch 8

Fixed more deprecated calls