Final fixes for scripts.