Fix scripts to match master