Update to 1.8, fix some warnings