I have only changed things which prevented compilation entirely. There are still many deprecations to deal with.