Downgrade to 470 and fix script issues