Update so it compiles with newer rust