Small script modifs