More changes to PM scripts