Update deprecated items so it compiles