Fixed a chunk of deprecation warnings
Updated couple more dep warnings