Upgrade to 1.6x environment