Update to build with the latest sdk (7.1)