Changes to bring into line with iShare 5.4