Scripts fixed