Fix extract scripts