Clean up Syntax warnings caused by newly deprecated methods