Fixed some deprecated calls...