fixes on scripts