Addres a few deprecation related warnings.