More tweaks to opener