Setup script modifs for 3.1.1