Update tools to latest, fix build script