Few changes to ease 5.6 troubles