Fix more DeprecationWarnings

Benjamin Mako Hill || Want to submit a patch?