Fix script ordering