Minor script modifications