Fix scripts for next API update