Update stuff
Make this compile on 1.7.10