Switch to new API URLs & fix build.