Update scripts in line with latest mOS changes