Silence a couple warnings, remove deprecated thingies.