Fix some script issues
Fix some script issues