More tweaks to patch1.2 script