Fixed some Deprecation Warnings.